bitkeeper revision 1.1327.2.6 (4269277eFXyepEq1XdwqGS1lcCxhhg)

Fix problem with netdevs not coming back on reboot.
Signed-off-by: Mike Wray <mike.wray@hp.com>

diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py
index 5ba2b2171cd98210c72758d77e07e4ab35fb9bd1..18e94e336a18cfc3a6f1b77aa52795b18c94eedd 100755 (executable)
--- a/tools/python/xen/xend/server/blkif.py
+++ b/tools/python/xen/xend/server/blkif.py
@@ -103,10 +103,11 @@ class BlkifBackend:
         self.destroyed = False
         self.connected = False
         self.evtchn = None
-        self.status = BLKIF_INTERFACE_STATUS_DISCONNECTED
+        self.status = None
 
     def init(self, recreate=False, reboot=False):
         self.destroyed = False
+        self.status = BLKIF_INTERFACE_STATUS_DISCONNECTED
         self.frontendDomain = self.controller.getDomain()
         self.frontendChannel = self.controller.getChannel()
         cf = channel.channelFactory()

diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py
index bdc104ae1746a32f3ca51fa0cf8bb6d0baf4a311..8c61994cafd255a3324c198fa6bf5d18d9870386 100755 (executable)
--- a/tools/python/xen/xend/server/netif.py
+++ b/tools/python/xen/xend/server/netif.py
@@ -23,7 +23,7 @@ class NetDev(Dev):
         Dev.__init__(self, controller, id, config, recreate=recreate)
         self.vif = int(self.id)
         self.evtchn = None
-        self.status = NETIF_INTERFACE_STATUS_DISCONNECTED
+        self.status = None
         self.frontendDomain = self.getDomain()
         self.frontendChannel = None
         self.backendDomain = None
@@ -40,6 +40,7 @@ class NetDev(Dev):
 
     def init(self, recreate=False, reboot=False):
         self.destroyed = False
+        self.status = NETIF_INTERFACE_STATUS_DISCONNECTED
         self.frontendDomain = self.getDomain()
         self.frontendChannel = self.getChannel()
         cf = channel.channelFactory()